Merge from emacs-24; up to r108062
authorGlenn Morris <rgm@gnu.org>
Fri, 29 Jun 2012 06:28:37 +0000 (23:28 -0700)
committerGlenn Morris <rgm@gnu.org>
Fri, 29 Jun 2012 06:28:37 +0000 (23:28 -0700)
commit80619939f92e5d9f1439b5a513b5249bf0ab55a2
treef25a38c5bb5a701ceee8b6f8bf15c101ac89826d
parentef6327c9d9c4fba8873c097dda587a4d874228c0
parent2c197108ac3719d2c1992dcffc1644a7c02145c2
Merge from emacs-24; up to r108062
doc/emacs/ChangeLog
doc/emacs/fixit.texi
etc/PROBLEMS
lisp/ChangeLog
lisp/minibuffer.el
lisp/progmodes/cperl-mode.el
lisp/progmodes/f90.el
lisp/progmodes/which-func.el
src/ChangeLog
src/charset.c
src/gnutls.c